Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 6 Sep 2011 18:29:03 +0000 (11:29 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 6 Sep 2011 18:29:03 +0000 (11:29 -0700)

Trivial merge